Skip to content

Make Codex auto-finish wait for merge and clean merged sandboxes#54

Merged
NagyVikt merged 1 commit intomainfrom
agent/codex/zeus-edixai-com-wait-merge-and-cleanup-v2
Apr 12, 2026
Merged

Make Codex auto-finish wait for merge and clean merged sandboxes#54
NagyVikt merged 1 commit intomainfrom
agent/codex/zeus-edixai-com-wait-merge-and-cleanup-v2

Conversation

@NagyVikt
Copy link
Copy Markdown
Collaborator

Automated by scripts/agent-branch-finish.sh policy update and regression tests.

This changes the codex-agent default finish flow from "merge attempt then keep" to
"wait/retry until merge succeeds, then clean merged branch/worktree".

agent-branch-finish now supports wait controls (, timeout,
poll interval) and retries PR merges until checks clear or timeout.
The template codex-agent passes wait+cleanup by default, and documentation was
updated to match the new default behavior.

Regression coverage now verifies both direct finish waiting behavior and
codex-agent end-to-end retry/cleanup behavior.

Constraint: Keep manual agent-branch-finish behavior backward compatible unless wait flags are explicit
Rejected: Force waiting for every finish invocation | would break manual async review workflows
Confidence: high
Scope-risk: moderate
Reversibility: clean
Directive: Codex automation should treat unresolved PR checks as incomplete work, not successful finish
Tested: npm test; node --check bin/multiagent-safety.js; npm pack --dry-run
Not-tested: Real GitHub required-check timing in external repos
@NagyVikt NagyVikt merged commit 7c598a8 into main Apr 12, 2026
12 checks passed
@NagyVikt NagyVikt deleted the agent/codex/zeus-edixai-com-wait-merge-and-cleanup-v2 branch April 12, 2026 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant